From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 27 Apr 2006 13:03:22 +0000 (+0100)
Subject: Bump Xen interface version number to 0x00030201 for new
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16108^2~69
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=02842d8a2b844d2d0b1421af7b2448ee8dd37bdf;p=xen.git

Bump Xen interface version number to 0x00030201 for new
structural guest handles.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig
index e71322028d..6bb58cb15f 100644
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig
@@ -106,7 +106,7 @@ config XEN_SYSFS
 config XEN_INTERFACE_VERSION
 	hex
 	depends on XEN
-	default 0x00030101
+	default 0x00030201
 
 config SCHED_NO_NO_OMIT_FRAME_POINTER
 	bool
diff --git a/linux-2.6-xen-sparse/drivers/xen/Kconfig b/linux-2.6-xen-sparse/drivers/xen/Kconfig
index 0595eb0028..054e1397de 100644
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig
@@ -13,7 +13,7 @@ config XEN
 if XEN
 config XEN_INTERFACE_VERSION
 	hex
-	default 0x00030101
+	default 0x00030201
 
 menu "XEN"
 
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 49314d9fd7..cd7793132c 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -12,7 +12,7 @@ XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
 
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
 
-CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030101
+CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030201
 
 %.opic: %.c
 	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h
index c4f235095d..ad8a1e1b43 100644
--- a/xen/include/public/xen-compat.h
+++ b/xen/include/public/xen-compat.h
@@ -9,7 +9,7 @@
 #ifndef __XEN_PUBLIC_XEN_COMPAT_H__
 #define __XEN_PUBLIC_XEN_COMPAT_H__
 
-#define __XEN_LATEST_INTERFACE_VERSION__ 0x00030101
+#define __XEN_LATEST_INTERFACE_VERSION__ 0x00030201
 
 #if defined(__XEN__)
 /* Xen is built with matching headers and implements the latest interface. */
@@ -23,9 +23,17 @@
 #error "These header files do not support the requested interface version."
 #endif
 
+/* New sched_op hypercall introduced in 0x00030101. */
 #if __XEN_INTERFACE_VERSION__ < 0x00030101
 #undef __HYPERVISOR_sched_op
 #define __HYPERVISOR_sched_op __HYPERVISOR_sched_op_compat
 #endif
 
+/* Structural guest handles introduced in 0x00030201. */
+#if __XEN_INTERFACE_VERSION__ < 0x00030201
+#undef __DEFINE_XEN_GUEST_HANDLE
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+    typedef type * __guest_handle_ ## name
+#endif
+
 #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */